Merge branch 'master' of /home/acm/emacs/emacs.git/master
authorAlan Mackenzie <acm@muc.de>
Tue, 30 May 2017 17:39:40 +0000 (17:39 +0000)
committerAlan Mackenzie <acm@muc.de>
Tue, 30 May 2017 17:39:40 +0000 (17:39 +0000)

Trivial merge